[Jackson 3] Fix #3580 Enum (de)serialization in conjunction with JsonFormat.Shape.NUMBER_INT
#5338
+231
−9
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@JooHyukKim This seems incomplete? Or maybe diff is missing something due to conflict? |
|
@cowtowncoder Yes, there were some other commits on same file, affecting this PR. THankss |
|
Ready for review! Just in case I wasn't clear enough |
|
|
||
| /** | ||
| * We may also have integer-type of representation for Enum's, along with `@JsonValue`. | ||
| * |
src/main/java/tools/jackson/databind/deser/jdk/EnumDeserializer.java
Outdated
Show resolved
Hide resolved
| */ | ||
| protected final boolean _isShapeNumberInt; | ||
|
|
||
| public EnumDeserializer(EnumResolver byNameResolver, boolean caseInsensitive, |
There was a problem hiding this comment.
Need to start deprecating methods, adding overloads (since it's 3.1, not 3.0)
src/main/java/tools/jackson/databind/deser/BasicDeserializerFactory.java
Show resolved
Hide resolved
| return null; | ||
| } | ||
| if (format.getShape() != JsonFormat.Shape.NUMBER_INT) { | ||
| throw new IllegalArgumentException("Failed to access @JsonValue of Enum value "); |
There was a problem hiding this comment.
Shouldn't this return null? Also, could perhaps also allow Shape.NUMBER.
| * Method used when ALL of conditions below are met | ||
| *<p> | ||
| * 1. actual String serialization is indicated using @JsonValue on a method in Enum class AND | ||
| * 2. Enum class is annotated with `@JsonFormat` |
There was a problem hiding this comment.
... with shape = Shape.NUMBER_INT ?
| * 2. Enum class is annotated with `@JsonFormat` | ||
| * | ||
| */ | ||
| public static EnumResolver constructUsingNumberShape(DeserializationConfig config, AnnotatedClass annotatedClass, AnnotatedMember accessor) |
There was a problem hiding this comment.
Should add Javadoc to explain what accessor is for... @JsonValue annotated thing?
| for (int i = enumConstants.length; --i >= 0; ) { // from last to first, so that in case of duplicate values, first wins | ||
| Enum<?> en = enumConstants[i]; | ||
| try { | ||
| Object o = accessor.getValue(en); |
There was a problem hiding this comment.
What is being accessed here?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.